diff --git a/tools/Makefile b/tools/Makefile
index b897923..5285055 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -224,7 +224,7 @@
 			HOSTOS=$(HOSTOS) \
 			HOSTARCH=$(HOSTARCH) \
 			HOST_CFLAGS="$(HOST_CFLAGS)" \
-		   	HOST_LDFLAGS="$(HOST_LDFLAGS)" \
+			HOST_LDFLAGS="$(HOST_LDFLAGS)" \
 			-C $$dir || exit 1 ; \
 		done
 endif
diff --git a/tools/easylogo/easylogo.c b/tools/easylogo/easylogo.c
index c20e6a7..00a1e4e 100644
--- a/tools/easylogo/easylogo.c
+++ b/tools/easylogo/easylogo.c
@@ -332,7 +332,7 @@
 	if (col)
 		fprintf (file, "%s\n", str);
 
-	/* 	End of declaration */
+	/*	End of declaration */
 	fprintf (file, "};\n\n");
 	/*	Variable */
 	fprintf (file, "fastimage_t %s = {\n", varname);
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
index 248f58c..c04da54 100644
--- a/tools/env/fw_env.h
+++ b/tools/env/fw_env.h
@@ -42,9 +42,9 @@
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
 #define CONFIG_BOOTCOMMAND							\
-	"bootp; " 								\
-	"setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " 	\
-	"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " 	\
+	"bootp; "								\
+	"setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} "	\
+	"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "	\
 	"bootm"
 
 extern int   fw_printenv(int argc, char *argv[]);
diff --git a/tools/gdb/remote.c b/tools/gdb/remote.c
index f40b6c6..c76a7ba 100644
--- a/tools/gdb/remote.c
+++ b/tools/gdb/remote.c
@@ -268,7 +268,7 @@
 
 	remote restart	RXX		Restart the remote server
 
-	extended ops 	!		Use the extended remote protocol.
+	extended ops	!		Use the extended remote protocol.
 					Sticky -- only needs to be set once.
 
 	kill request	k